Various fixes v0.22.5