Fix shadowed declaration warnings