v0.10.2.18 - some small fixes