Fix client side validation after upstream merges