small final fixes.