- Minor fixes in preparation for demo