Fixed out of date refs to stuff