tweaks for NCL build and rebuild