Workspace and url fixes