Minor change
Minor bugfix
Changes regarding the address of the ComponentType message