Patch useless gaps, update workspaces