Fix Validations and Error bugs