Fix typo bug
Tweak validations for replacement events