Fix remaining splitter issues