Remove debug, fix instance where custom date formats may cause errors