fixes for macro trees