Missed a few const conversions