Misc inspection cleanups