Added some missing 'const' qualifiers