Fix more undeclared reference assignments