Some more Debian ish support