Fix build error and reduce the RPMLint warnings