Fixes to scripts to create RPMs