Fix targeting crashes