Fix all remaining path issues for 2.x branch.