Bug 851670 - More platform tweaks