Fix assemblies and components