Fix a couple of bugs with attributes.
@bug W-2085820@
@bug W-2085827@
Merging origin/aballard/master-pending-access-fixes into master