Fix compilation warning
Merge branch 'speed-improvements' into speed-improvements2