Fixed two more invalid references to object variable