New small fixes.