validation fixes
closes #376