Fixes remaining issues with initial workspaces creation