Timestamp format tweaks