Fix for new API from WMCore.  CAF-223
Minor tweaks from testing the splitter.