Fixes from Demo session