Services problem fixing

Unfortunately the OSGi service do not work for me now, though just in case someone else can spot the problem, she or he can add another commit.
The SPI service seems to work fine though.