Fixes for new time types