Fix remaining linker errors.