Added some code to allow mac osx compilation.
Some changes to allow compasion of the old and the new component analyzer