Another part of fixes.