Minor updates to ActivateComponent