Some other minor fixes.