different small fixes