DIY Boiler Fixes