Minor fixes to build scripts and procedure
Merge pull request #786 from gzm0/fix-build-scripts

Minor fixes to build scripts and procedure