Minor Changes for Android