Finished some validations