Some pre-final fixes