some more autocomplete fixes