some more fixes etc