Added better handling of sysimage device search