Fix timestamp parsing problems