Bug5235/mobility misc fixes2