Simplify workspace connection. Fix crash in demo