Fixes validation errors