First of final fixes.