more date/time fixes