[nes]: Misc changes ...