Mobile Bug fixes