Improvements for android performance.