Validation and Status Fix