Make ubuntu install more flexible for #439