Script changes to repair MS's compile errors.