Fixes in splitter