Fix some compilations errors