Changed base classes in a few examples