Minor changes for NWC bugs