Fix various wrong refs.