7.x tying up loose ends