Necessary changes to build RPMs