Fixes to make examples work with new architecture