Fixes in components

Those two fixes are needed for Debian packaging.