Some small fixes (mostly mobile)