ABI compatibility fixes