Cleanup and rpm build changes