Fix some references to undefined fields