Some more Ubuntu fixes.