Fix exchange policy updation. Tools updates