Attempting to fix deadlock on device updates