The recent claims of g-mode detection have restarted the search for these potentially extremely important modes. These claims can be reassessed in view of the different data sets available from the SoHO instruments and ground-based instruments. We produce a new calibration of the GOLF data with a more consistent p-mode amplitude and a more consistent time shift correction compared to the time series used in the past. The calibration of 22 years of GOLF data is done with a simpler approach that uses only the predictive radial velocity of the SoHO spacecraft as a reference. Using p modes, we measure and correct the time shift between ground- and space-based instruments and the GOLF instrument. The p-mode velocity calibration is now consistent to within a few percent with other instruments. The remaining time shifts are within +/-5s for 99.8% of the time series.