Fix some instance variable references to avoid NoMethodErrors.