Maintenance: Revise the demos so they now compile