Some final fixes.