more inspector changes to convert to new scheme