fixes to make examples work