Fix unchanged variable name
Fix a variable collision from the same tweak
Fix an infinite loop from the same change