Fixing some more time questions