Fixed some ugly "const" code