(c) Fix another compilation issues