Fix some regressions in the mobile version