[BUGFIX] Fix module access regressions