Fix `si4demo` issues