More tweaks for first live