Constness fixes.