Fix old loop on List & Map (iterator -> foreach)