Changes to build RPMs