Fixes for 2.3 release
Fixes for 2.3 release