Fixups added while making Hotplate work again