Fixed const-correctness issues
4 files changed