Some fixes allowing for loading the module

Yet it does not work...