Fix builds
Merge pull request #23 from jjbohn/fix-builds

Fix builds
fix some conflicts.