more time fixes