added quickfixes for android 2