final fixes for kie-wb