small fixes etc