android2.3: fixes for android <= 2.3
Merge pull request #99 from claydotio/android-2-3-fixes

android2.3: fixes for android <= 2.3