strict validation fixes