Further compilation fixes