Data feed fixes