More small fixes .. Sorry!