Some ABI hotfixes