Fix time issues