Fixes issues #3 and #5 concerning Android 2.3.x.