Bug 917990 - Multiple fixes.