Temp timezone fix and other minor stuff