Clean up a few historical anomalies