More fixes to paths
Merge branch 'refs/heads/f/rpm'