Fix some more refs