Fix issues with missing order total modules