Tweaks and wip for timezone handling