More fixes to split space