last of the fixes.