Various fixes for easier Debian packaging