Fixes for data weirdness in earlier years