Fixed more const issues with C++