Add support for newer versions of Ubuntu