Fix multi-connection schema diffing

… and some quick fixes.