Ugh, still more refs