Fixing the remaining examples