some fixes etc