Fix the build -- I'm pretty sure it won't run, though (more fixes are needed)