Build updates and fixes

Hi
Attached, please find some patches and clean up of the spec file for your consideration,