Small changes for moving demos around and stuff.