Global/FAO-Commodities fixes for NP