Fixes to SplitController.