Live: several small bugfixes