Some changes to hopefully stop crashes on obscure Samsung devices