Topic/billing fixes