Fixing time issues