Sip update and const correctness