Change bool type to short to preserve compat