Minor changes after demo.