Clean up a couple code-green issues.