Block another way to retrieve the Device ID - fixes