Era/time fixes, refs #221