MOB-1543 fixes

Fixes for @RodriGomez so he can process with QA'ing MOB-1543.