fix issues with modules upgrade