More linux compilation fixes