New ABI
use sizeof instead of a define value
adapt to tip/master ABI