Tweaks for module handling.