Fix compilation problems on Fedora (Laurent)