minor buggfixes after uc failure