Are these actually relevant to this PR?