Fixes to hooks and other bmo stuff