Clean up validations and add a few more.