Some more minor code fixes.