Resplication and workspace fixes