add 2.1.1 release fixes