More fixes to Stable7