Removed OSGi capabilities; Bugs fixed