Level 6 repair, small tests/tweaks