Most of date-time stuff is working again.
@staabm's suggesstions.