Attempted to fix more errors related to object attributes.