Fix up fetch_classes