Topic/misc fixes