Started to fix demos