Fix reference error
Fix more reference errors