Fix weekday issues