A few small fixes.