Various small fixes.