minor fixes etc