More linux compilation issues fixed