More fixes and another example.