Fixed msftidy warnings.