Fix shadowed variables