Fix misc validation errors