Handle time fields better.