Fixed issues that came up during taped demo.