Fixed more demos