Fixes and hook rework