Bug fixes for live updating