Validation040 bugfix

More minor fix(es)