Some more ubuntu fixes