Fix validation warnings/errors