Fixing even more time bugs