Add missing assemblies n stuff