Update some stuff based on device testing