Fixes for shelly 1.0