Fixed numerous validation errors