Fix some problems with the build for the last time, I hope