Minor attribution control clean-ups