Fixes for timezone [skip ci]