validation fixes by jagbir