Merge pull request #50 from bphinz/buildfixes

Fixes for package builds after commit f95272d.