Add a few more const