Fix remaining compile/link/presubmit errors.