Check Hooks Fixes