Fixes to the module and the conf files