RPM compile fixes