Fixes for weekend demo.