Typed + Plain fixes [CI SKIP]