Fixup compile errors.