fixes to the module build