Various changes to time handling for consistency