0007: fixes + validation differentiation