Fixed time issues