Some changes needed for Xperia devices