TimeTypes #167, #157

- Misc