* Small fixes with workspace.