More robustness in case of misbehaving installations
Small cleanups