Bug fixes in demo file.