Also fix some loop variables use, one of which potentially is
related to ADHOC not working, i.e. it was not being properly
initialized, thanks to gcc 3.3.1 (pre-release) and this was
caught...