Fixes few smaller issues

We talked via email earlier and here the first change I would like to propose.