Fix all current compilation errors (woo!)