Linux compilation issues fixes