More fixes etc.