Reference fixes for sa family
More reference cleanup