Fixes for SmartSantander DeviceDB / EventBroker integration