Fixed References to other stuff