Fixing up other examples