Fix member shadowing warnings