Fix build, mostly