Add a couple of 'const' and a missing star