Some small fixes.