Sharpen the process (make it consistent with changes to XBMC code)