Fix caps that throw msftidy warnings