ABI compliance fixes.