Additional fixes for live