final fixes for v2.24