first compilation fixes