some bug fixing wrt timezones