Fix Fedora/Mageia build errors (index shadowing)