Fix cbp and hook stuff