fixed some validation errors