Some small module changes before migrating everything to OSGi.