More fixes to example