some fixes in Live