Trying to fix refs