Fixes for multi instance demo