Fixup compile errors