Corrections in module and plugin file