Bugfixes during validation