Fixes for building RPM