Fix time zone comparisons

This really should have been two separate pull requests but I goofed. Oh well. :grin: