Added trivial const qualifiers