Fix time checks