More fixes to invalid assemblies