Fix millisecond parsing for more cases