Deal with lack of time zone in input, fix comment field name