Fixes to accommodate Hotplate