Validation and fixes