Fixes based on Shelly diff file