Module params fixes. Closes #38