Fixing some mobile issues