Fixing some breakages caused by elimination of get by UUID methods.