Some more build tweaks, alleviating concurrency issues
Merge pull request #415 from khawkins/more_build_fixes

More build fixes