Fix for noop override and some other minor changes

Ciao Alessandro,

  Fixing modules as requested. ;)

  Regards, Javier