Fix various OSGi descriptor mistakes