Fix live integration