Demos fixed for refactored wrapper implementation