Small tweaks. no sopro_components yet.