More fixes to level connections