pre-final fixes