Mobile issue fixes