Begin fixing demo services