add property and target fixes