Fix constification warnings