Fixes some various things, but build still breaks. This is only temporary.