NOJIRA:  Tidy up a load of license and NOTICE issues