Fixed two validation errors