Various fixes v0.22