Fix around hook scenarios with change to core