Fixes on modules