A couple of small fixes bringing all assemblies inline with each other - and correct state