Some fixes and cleanups so that rpmlint stops yelling at me.