Minor tweaks to pass the target by reference for modification