Fixes for smartphone