More continuity fixes