Date time fixes lol