Fixed Validation Bugs