More tweaks for when it runs on the actual device.