Bug fix

Fixes MOBILE-1382 and a couple of string issues.