Minor changes

Now builds without modification on Debian