New wave of fixes.