more generics autocomplete fixes