some assorted OSGi fixes