fixes a few shadow  warnings