Fixes for demo