Bugs fixed during interactive demo with GJH.