Removed some shadowed variable warnings