Fixed some reference problems from last merge