small final fixes