Some more code fixes.