Fix day of week calculations (again)