final fixes for historical