Resolve general issues for Nov. '13 demo