Small fixes for minimalist demo