RCB addon fixes