applying XBMC and RCB fixes