Tweak hooks
fixup! Tweak messages