Tmp quickfixes before new interface