[wip] compilation fixes