Some fixes

Probably #220 is duplicate of #206
In next `PR`