Fix 2 issues: don't use last() on temp object and use for loop reference

Authored by hindenburg on Apr 2 2018, 2:26 PM.