+more late time fixes