Fixing demo services