some Heat fixes.