Fix some undefined names