Fixed module issues