Trying to fix demos