Bug fixes to mobile component