bugfixes for live operation