Base: Improve support for OSPi without mobile plugin