Tweaks common module loading