Fix to device setup