Fix some minor issues found via static analysis

No match.