Two commits

There should be two commits in this.  Interested to see if you pick up both of them by pulling