Linux compilation fixes (2)