Merge latest ubunut fixes from roxy