Oh god, more Target ID tweaks

This may, in fact, be the last one.