Some more changes for the common components.