Validity issues fixes.