Continuing the fixes.