Made module manager more … stable.