(#7) A few more fixes.