Assorted bugfixes
Automatically use method splitter if needed