Minor changes to fix RPM builds