Small bugfixes

Production always gives surprises !