Bugfixing validation issues