Minor inspection cleanups