Android App Bug Fixes