some fixes etc.