Minor fixes implemented before demo.