Fix more New Year bugs