Fix upgrade-child: could not update child unless guarantor was defined. Also, limit...