Fix some inconsistencies
Remove zero-pad from hours