Fix some 'is' problems.