Updates to build on Debian

Some last fixes to get it building.