Further small fixes.