Ubuntu compat shim fixes cont.