Working D1 builds

Also fixed the "syncing work tree" hangups