Fix msftidy warnings