Fix build some more after changes for gh-84