Further fixes prior to demo