Fixed several live issues