Some linux compilation issues fixed