Bug 928621 - multiple fixes.