IDE-1432 IDE-1433 more fixes for demo