Time issues fixed