Changes necessary to make Demo and the test case on the wiki compile and run.