timestamp fixes from groovy_dev