Fix date conversion error and remove @engine comments