Fix more make-publish breakage