Corrections for CPU version