Fixes for Demo