Close entity inputstream after last access
Improved logging
Removed duplicate component scan
CDK-64: Made gadget work again.