Some fixes to the module dev branch