Fixed issues with modules