Fixes related to latest Chibi revision