fixes to timezone stuff