Fixed up universal commands / parameters for modules