Add const etc. to places forgotten from the previous commit