Fix (some) validator warnings.