Even more fixes, this time for the right variables