Fixing more accessor issues.