final fixes for the 2.3.x release