More changes for standalone devices.