build fixes
Merge pull request #1 from jlambert121/pkg_fixes

build fixes