Fixed some issues with RPM build