Solutions for 10536 on unsupported devices