Topic/ie fixes