lookups and users fix