Topic/fix build