Trying to make things a bit more Debian/Ubuntu-friendly