new commits

fixes on android 2.3 variant