Fixup API and crash