Fixing modal paths after refactoring