Fix more errors in hook move