compilation fixes etc.