fortify fixes and api adjustments