Pre-release fixes, including msftidy errors.