FIX make examples work with current codebase