'const * const' fixes