Fix some small issues.