Mobile fixup

This addresses two regressions being tracked in #1330