fix bugs surfacing in android 4.4