Add some Ubuntu patches