Unit changes fixes bluefor friendly bug