Fix more broken references. These should be the last 2