General fixes to install the modules correctly