final fixes for v2.23