Some fixes for ET demo; more to come