Fixing problems introduced by earlier commits.