More small fixes