And more ubuntu fixes