Compiler suggested cleanups - mostly const fixups