validity fixes