Fixed osgi loading issues