Bug fixes to Transform time handling