Fix an include path
Fix NOP
Add struct slot_idx