Small robustment fixes for modbus and zwave