More final fixes