v0.13 more fixes