Time formats fixed