last quick fixes for demo