2 other fixes for dates