Various delete fixes (with immediate refresh)