compilation fixes after Oxygene merge