A couple more fixes for paths after refactor.