Inspect tool fixes