Convert to using ISO8061 specification for timestamps
Fix Hang on shutdown