New Ubuntu related fixes.