three patches for the current const correctness change