Issues Fixed on Android