REALLY fixing the remote ref problems.