validation fixes - closes #34