fixed minor problems with Android 4.0.4