validate revert fixes