final fixes for version 1.5