Small msftidies
Land #3049, small msftidies