Fix 2 crashes on the Galaxy S II