Use correct macro in Stage & fix wild pointer issue in RenderTaskList