#30: Fixes to mobile