Fix some more loopy stuff.