Fix some problems with the build again