Updates to build on Debian

Some last fixes to get it building.
Merge pull request #1 from sjml/patch-2

Updates to build on Debian