Fix some more small issues.