Various validations fixes