kill warnings and fix list iterator