tweaks so that use_classes works properly