Fixes for hooks controller