matches to const correctness fixes