Changes to adapt to the new Hotplate