Fix some validation error