Minor IModule tweaks.