Fixing accessor issues