various fixes

(mainly, defs needed to be conjoined to current_heap in several places)