Assemblies fixes

A variety of assemblies fixes for bugs reported.