Fix buggy use of server side targeting

We should now set the target correctly.

Also removed some unnecesary hardcoded target positions.