Minor Mods to Code Hooks