Initial Heat fixes