Changes for recent ubuntu releases.