MOBILE-155 Small fixes