Fix typo/bugs in Activator and OSGI-INF files