Topic/prod style fixes