Scaffolds - Fix: schema & connection compatibility fixes
QA - Fix: formatting & whitespace