Tweaks for live operation

Fix production issues.