Timestamp: Various fixes and additions