Fix handling of timestamp fields