-final fixes for 2.2.4