fixes etc