Bug fixes for live server