Fix handling of non-OSGi