More time tweaks