Fix some compilations.  To be continued