Validation Errors Fixed