Fixed errors missed from prior refactoring.