Fixed a few targeting bugs