Fix for MS Policy Tosca Model and other items