Fix timestamp bugs

Fixes #16