Improving Ubuntu support