More ubuntu fixes