Better handling of target when not explicitly set.