Fixed Nbw build errors