Add more const variable/pointer

2 jobs for master in 5 minutes and 48 seconds (queued for 218 minutes and 20 seconds)