Fix #899

 - Handle core modules and installed modules separately

 - Include core modules in modules to activate