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

(cherry picked from commit d9fd86ec9f699de49ce40101da8a79ca9926a267)