timezone related fixes