final fixes for 1.5