Android1

Minor optimizations for Android App performance