Fixing a few more refs to the old locations