fix some issues on Samsung device