Changes to make examples work