Bugfixes

Two small bugfixes, as a start...
Bye,
Giuseppe