PR of the two commits that graz emailed us to say were needed.