Fix some minor validity issues.