Tmp fixes for datetime field