fix two shadowing issues