Various fixes, more on RCB