Update for modern ubuntu