Fix classloading and change OSGI exports to enable service overrides