Fixing some stuff for real devices.