Some fixes for latest MS updates