Heat horizon bugfixes contd