Fixes for 1.1.X
Fixes for 1.1.X