Fix hour change bugs