Minor fixes for live data