Fixes, 2.3 release