more fixes for new path refactoring