Fix a reference and add some retry code to SetPropertyCommand from previous master that I forgot