Some fixes

Probably #220 is duplicate of #206
I would put this in a new variable.