Fix targeting/attacking for the systems