Some more Debian fixes