Fix live data related bugs
Merge pull request #3 from karllindmark/fix-live-data-bugs

Fix live data related bugs