Progress on fixing datetime FT