Merge latest ubuntu fixes from roxy