changes for osi stuff build