Heat flux fixes