Resolved Android 2.3 issues