Barrel exchange and some Ocean socket changes