Reduce validation errors (related to #77)