More small fixes.