Fixed problem with duplicate devices being created. All good now.