Fixes to builder submodules and deb targets