Fixed OSGi package imports