Fix couple of mobile issues