Fixes to allow building a Debian package on Debian