Fixing more timezone bugs