device and equipment fixes for update