Apparent final fixes.