Base: Improve OSPi support